transmission_set_buffer(struct transmission *t,
unsigned char *buffer, unsigned int len)
{
- if (NULL != t->request) {
- kfree(t->request);
- }
+ kfree(t->request);
t->request = kmalloc(len, GFP_KERNEL);
if (t->request) {
memcpy(t->request,
static inline void
transmission_free(struct transmission *t)
{
- if (t->request) {
- kfree(t->request);
- }
- if (t->rcv_buffer) {
- kfree(t->rcv_buffer);
- }
+ kfree(t->request);
+ kfree(t->rcv_buffer);
kfree(t);
}
unregister_xenbus_watch(&be->backend_watch);
if (be->blkif)
blkif_put(be->blkif);
- if (be->frontpath)
- kfree(be->frontpath);
+ kfree(be->frontpath);
kfree(be);
return 0;
}
free_be:
if (be->backend_watch.node)
unregister_xenbus_watch(&be->backend_watch);
- if (frontend)
- kfree(frontend);
+ kfree(frontend);
kfree(be);
return err;
}
destroy_blkring:
blkif_free(info);
out:
- if (backend)
- kfree(backend);
+ kfree(backend);
return err;
}
unregister_xenbus_watch(&be->backend_watch);
if (be->blkif)
blkif_put(be->blkif);
- if (be->frontpath)
- kfree(be->frontpath);
+ kfree(be->frontpath);
kfree(be);
return 0;
}
free_be:
if (be->backend_watch.node)
unregister_xenbus_watch(&be->backend_watch);
- if (frontend)
- kfree(frontend);
+ kfree(frontend);
kfree(be);
return err;
}
return 0;
fail:
- if (dev1 != NULL)
- kfree(dev1);
- if (dev2 != NULL)
- kfree(dev2);
+ kfree(dev1);
+ kfree(dev2);
return err;
}
unregister_xenbus_watch(&be->backend_watch);
if (be->netif)
netif_disconnect(be->netif);
- if (be->frontpath)
- kfree(be->frontpath);
+ kfree(be->frontpath);
kfree(be);
return 0;
}
free_be:
if (be->backend_watch.node)
unregister_xenbus_watch(&be->backend_watch);
- if (frontend)
- kfree(frontend);
+ kfree(frontend);
kfree(be);
return err;
}
np->netdev = netdev;
exit:
- if ((err != 0) && (netdev != NULL))
+ if (err != 0)
kfree(netdev);
else if (val != NULL)
*val = netdev;
packet_free(struct packet *pak)
{
del_singleshot_timer_sync(&pak->processing_timer);
- if (pak->data_buffer) {
- kfree(pak->data_buffer);
- }
+ kfree(pak->data_buffer);
/*
* cannot do tpmif_put(pak->tpmif); bad things happen
* on the last tpmif_put()
{
struct backend_info *be = dev->data;
- if (be->watch.node) {
+ if (be->watch.node)
unregister_xenbus_watch(&be->watch);
- }
unregister_xenbus_watch(&be->backend_watch);
tpmif_vtpm_close(be->instance);
- if (be->tpmif) {
+ if (be->tpmif)
tpmif_put(be->tpmif);
- }
- if (be->frontpath)
- kfree(be->frontpath);
+ kfree(be->frontpath);
kfree(be);
return 0;
}
free_be:
if (be->backend_watch.node)
unregister_xenbus_watch(&be->backend_watch);
- if (frontend)
- kfree(frontend);
+ kfree(frontend);
kfree(be);
return err;
}
destroy_tpmring:
destroy_tpmring(info, &my_private);
out:
- if (backend)
- kfree(backend);
+ kfree(backend);
return err;
}
}
pblkif = &curs->hash_next;
}
- if (blkif != NULL)
- free(blkif);
+ free(blkif);
}
void blkif_register_request_hook(blkif_t *blkif, char *name,
return block;
err:
- if (qe->block)
- free(qe->block);
+ free(qe->block);
free((void *)qe);
return NULL;
}
*
* @return: pointer to new block, NULL on error
*/
-void *newblock() {
+void *newblock(void) {
void *block = malloc(BLOCK_SIZE);
if (block == NULL) {
perror("newblock");
* @block: block to be freed
*/
void freeblock(void *block) {
- if (block != NULL)
free(block);
}
*
* @return: pointer to new block, NULL on error
*/
-void *newblock() {
+void *newblock(void) {
void *block = malloc(BLOCK_SIZE);
if (block == NULL) {
perror("newblock");
* @block: block to be freed
*/
void freeblock(void *block) {
- if (block != NULL)
free(block);
}
r.u.i = -1;
/* free any saved node vals. */
for (i=0; i<3; i++)
- if (req->radix[i] != 0) free(req->radix[i]);
+ free(req->radix[i]);
free(req);
cb(r, req_param);
}
/* Free everything else. */
if (be->blkif)
free_blkif(be->blkif);
- if (be->frontpath)
- free(be->frontpath);
- if (be->backpath)
- free(be->backpath);
+ free(be->frontpath);
+ free(be->backpath);
free(be);
return 0;
}
return;
fail:
- if (fepath)
- free(fepath);
+ free(fepath);
}
}
fail:
- if (path)
- free(path);
-
+ free(path);
}
static void blkback_probe(struct xs_handle *h, struct xenbus_watch *w,
return;
free_be:
- if ((be) && (be->backend_watch.node))
+ if (be && (be->backend_watch.node))
unregister_xenbus_watch(h, &be->backend_watch);
- if (frontend)
- free(frontend);
- if (bepath)
- free(bepath);
+ free(frontend);
+ free(bepath);
free(be);
return;
}
return dom;
out:
- if (dom->conspath)
- free(dom->conspath);
+ free(dom->conspath);
free(dom);
return NULL;
}
if (!buffer_empty(&d->buffer))
return;
- if (d->buffer.data) {
- free(d->buffer.data);
- d->buffer.data = NULL;
- }
-
if (d->tty_fd != -1) {
close(d->tty_fd);
d->tty_fd = -1;
}
- if (d->conspath) {
- free(d->conspath);
- d->conspath = NULL;
- }
+ free(d->buffer.data);
+ d->buffer.data = NULL;
+
+ free(d->conspath);
+ d->conspath = NULL;
remove_domain(d);
}
goto error_freesyms;
/* Commit */
- if (disas_symtab)
- qemu_free(disas_symtab); /* XXX Merge with old symbols? */
- if (disas_strtab)
- qemu_free(disas_strtab);
+ qemu_free(disas_symtab); /* XXX Merge with old symbols? */
+ qemu_free(disas_strtab);
disas_symtab = syms;
disas_num_syms = nsyms;
disas_strtab = str;
static void start_mouse_calibration() {
int size = screen->height*screen->paddedWidthInBytes;
- if(mouse_magic->calibration)
- free(mouse_magic->calibration);
+ free(mouse_magic->calibration);
mouse_magic->calibration = malloc(size);
memcpy(mouse_magic->calibration, screen->frameBuffer, size);
calibration_step=0;
}
static void stop_mouse_calibration() {
- if(mouse_magic->calibration)
- free(mouse_magic->calibration);
+ free(mouse_magic->calibration);
mouse_magic->calibration = 0;
}
{
// N.B. gva should be page aligned
- unsigned long *page_array=NULL;
+ unsigned long *page_array = NULL;
int i;
if ( (page_array = malloc(nr_pages * sizeof(unsigned long))) == NULL ){
return 0;
error_out:
- if (page_array)
- free(page_array);
+ free(page_array);
return -1;
}
goto error_out;
}
- if ( image != NULL )
- free(image);
+ free(image);
ctxt->flags = VGCF_VMX_GUEST;
ctxt->regs.cr_iip = 0x80000000ffffffb0UL;
return rc;
error_out:
- if ( image != NULL )
- free(image);
-
+ free(image);
return -1;
}
return 0;
error_out:
- if ( mmu != NULL )
- free(mmu);
- if ( page_array != NULL )
- free(page_array);
+ free(mmu);
+ free(page_array);
return -1;
}
#endif
close(initrd_fd);
if ( initrd_gfd )
gzclose(initrd_gfd);
- if ( image != NULL )
- free(image);
+ free(image);
#ifdef __ia64__
/* based on new_thread in xen/arch/ia64/domain.c */
gzclose(initrd_gfd);
else if ( initrd_fd >= 0 )
close(initrd_fd);
- if ( image != NULL )
- free(image);
-
+ free(image);
return -1;
}
return 0;
error_out:
- if ( mmu != NULL )
- free(mmu);
- if ( page_array != NULL )
- free(page_array);
+ free(mmu);
+ free(page_array);
return -1;
}
goto error_out;
}
- if ( image != NULL )
- free(image);
+ free(image);
ctxt->flags = VGCF_VMX_GUEST;
/* FPU is set up to default initial state. */
return rc;
error_out:
- if ( image != NULL )
- free(image);
-
+ free(image);
return -1;
}
}
val = PyString_FromStringAndSize(xsval, xsval_n);
exit:
- if (xsval)
- free(xsval);
+ free(xsval);
return val;
}
val = Py_None;
exit:
Py_XDECREF(tuple0);
- if (xsperms)
- free(xsperms);
+ free(xsperms);
return val;
}
/* Create tuple (path, token). */
val = Py_BuildValue("(sO)", xsval[XS_WATCH_PATH], token);
exit:
- if (xsval)
- free(xsval);
+ free(xsval);
return val;
}
vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status));
egress:
- if (flat_global)
- free(flat_global);
+ free(flat_global);
close(fh);
return status;
else if (format == __FMT_SIZE || format == __FMT_HSIZE) {
s += size;
BSG_BYTE* ptr = *(BSG_BYTE**) s;
- if (ptr)
- free(ptr);
+ free(ptr);
s += sizeof(void*);
} else if (format == __FMT_PACKED) {
if (node) {
if (node->domains) {
- for (i = 0; i < node->num_domains; i++) {
- if (node->domains[i].name)
- free(node->domains[i].name);
- }
+ for (i = 0; i < node->num_domains; i++)
+ free(node->domains[i].name);
for (i = 0; i < NUM_COLLECTORS; i++)
if((node->flags & collectors[i].flag)
talloc_free(node);
}
-#
-
static void setup_structure(void)
{
char *tdbname;
static void chwall_free_domain_ssid(void *chwall_ssid)
{
traceprintk("%s.\n", __func__);
- if (chwall_ssid != NULL)
- xfree(chwall_ssid);
+ xfree(chwall_ssid);
return;
}
chwall_bin_pol.max_types = chwall_buf->chwall_max_types;
chwall_bin_pol.max_ssidrefs = chwall_buf->chwall_max_ssidrefs;
chwall_bin_pol.max_conflictsets = chwall_buf->chwall_max_conflictsets;
- if (chwall_bin_pol.ssidrefs != NULL)
- xfree(chwall_bin_pol.ssidrefs);
- if (chwall_bin_pol.conflict_aggregate_set != NULL)
- xfree(chwall_bin_pol.conflict_aggregate_set);
- if (chwall_bin_pol.running_types != NULL)
- xfree(chwall_bin_pol.running_types);
- if (chwall_bin_pol.conflict_sets != NULL)
- xfree(chwall_bin_pol.conflict_sets);
+ xfree(chwall_bin_pol.ssidrefs);
+ xfree(chwall_bin_pol.conflict_aggregate_set);
+ xfree(chwall_bin_pol.running_types);
+ xfree(chwall_bin_pol.conflict_sets);
chwall_bin_pol.ssidrefs = ssids;
chwall_bin_pol.conflict_aggregate_set = conflict_aggregate_set;
chwall_bin_pol.running_types = running_types;
error_free:
printk("%s: ERROR setting policy.\n", __func__);
- if (ssids != NULL)
- xfree(ssids);
- if (conflict_sets != NULL)
- xfree(conflict_sets);
- if (running_types != NULL)
- xfree(running_types);
- if (conflict_aggregate_set != NULL)
- xfree(conflict_aggregate_set);
+ xfree(ssids);
+ xfree(conflict_sets);
+ xfree(running_types);
+ xfree(conflict_aggregate_set);
return -EFAULT;
}
ste_free_domain_ssid(void *ste_ssid)
{
traceprintk("%s.\n", __func__);
- if (ste_ssid != NULL)
- xfree(ste_ssid);
+ xfree(ste_ssid);
return;
}
/* 3. replace old policy (activate new policy) */
ste_bin_pol.max_types = ste_buf->ste_max_types;
ste_bin_pol.max_ssidrefs = ste_buf->ste_max_ssidrefs;
- if (ste_bin_pol.ssidrefs)
- xfree(ste_bin_pol.ssidrefs);
+ xfree(ste_bin_pol.ssidrefs);
ste_bin_pol.ssidrefs = (domaintype_t *)ssidrefsbuf;
/* clear all ste caches */
error_free:
printk("%s: ERROR setting policy.\n", __func__);
- if (ssidrefsbuf != NULL) xfree(ssidrefsbuf);
+ xfree(ssidrefsbuf);
return -EFAULT;
}
if ( t != NULL )
{
xfree(t->active);
- if ( t->maptrack != NULL )
- free_xenheap_page(t->maptrack);
+ free_xenheap_page(t->maptrack);
xfree(t);
}
return -ENOMEM;
if ( (x == NULL) || (y == NULL) )
{
- if ( x != NULL )
- free_xenheap_page(x);
- if ( y != NULL )
- free_xenheap_page(y);
+ free_xenheap_page(x);
+ free_xenheap_page(y);
return -ENOMEM;
}
/* Free resources associated with a struct mtrr_state */
void __init finalize_mtrr_state(void)
{
- if (mtrr_state.var_ranges)
- xfree(mtrr_state.var_ranges);
+ xfree(mtrr_state.var_ranges);
mtrr_state.var_ranges = NULL;
}
void destroy_vmcs(struct arch_vmx_struct *arch_vmx)
{
- if(arch_vmx->vmcs != NULL)
- free_vmcs(arch_vmx->vmcs);
- if(arch_vmx->io_bitmap_a != 0) {
- free_xenheap_pages(
- arch_vmx->io_bitmap_a, get_order_from_bytes(0x1000));
- arch_vmx->io_bitmap_a = 0;
- }
- if(arch_vmx->io_bitmap_b != 0) {
- free_xenheap_pages(
- arch_vmx->io_bitmap_b, get_order_from_bytes(0x1000));
- arch_vmx->io_bitmap_b = 0;
- }
- arch_vmx->vmcs = 0;
+ free_vmcs(arch_vmx->vmcs);
+ arch_vmx->vmcs = NULL;
+
+ free_xenheap_pages(arch_vmx->io_bitmap_a, get_order_from_bytes(0x1000));
+ arch_vmx->io_bitmap_a = NULL;
+
+ free_xenheap_pages(arch_vmx->io_bitmap_b, get_order_from_bytes(0x1000));
+ arch_vmx->io_bitmap_b = NULL;
}
/*
(void)__evtchn_close(d, i);
for ( i = 0; i < NR_EVTCHN_BUCKETS; i++ )
- if ( d->evtchn[i] != NULL )
- xfree(d->evtchn[i]);
+ xfree(d->evtchn[i]);
}
/*
if ( t != NULL )
{
xfree(t->active);
- if ( t->maptrack != NULL )
- free_xenheap_page(t->maptrack);
+ free_xenheap_page(t->maptrack);
xfree(t);
}
return -ENOMEM;
{
unsigned long flags;
+ if ( v == NULL )
+ return;
+
memguard_guard_range(v, 1 << (order + PAGE_SHIFT));
local_irq_save(flags);
projects / xen.git / commitdiff